Merge "Update suppressWarning()/restoreWarning() calls"